From: Timo Röhling Date: Thu, 22 Jun 2023 08:58:27 +0000 (+0200) Subject: Do not overwrite ImportExecutables-None.cmake during build X-Git-Tag: archive/raspbian/1.9.25+dfsg3-1+rpi1^2~33 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=44eec0dcd105368ecc3ecbe889f35c30ca17c5b8;p=filament.git Do not overwrite ImportExecutables-None.cmake during build --- diff --git a/debian/patches/0020-Do-not-overwrite-debianized-ImportExecutables.patch b/debian/patches/0020-Do-not-overwrite-debianized-ImportExecutables.patch new file mode 100644 index 0000000..30bc4a8 --- /dev/null +++ b/debian/patches/0020-Do-not-overwrite-debianized-ImportExecutables.patch @@ -0,0 +1,24 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Thu, 22 Jun 2023 10:57:51 +0200 +Subject: Do not overwrite debianized ImportExecutables + +Forwarded: not-needed +--- + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 632ece6..05c605d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -671,10 +671,6 @@ if (IS_HOST_PLATFORM) + add_subdirectory(${TOOLS}/specular-color) + endif() + +-# Generate exported executables for cross-compiled builds (Android, WebGL, and iOS) +-if (NOT CMAKE_CROSSCOMPILING) +- export(TARGETS matc cmgen filamesh mipgen resgen glslminifier FILE ${IMPORT_EXECUTABLES}) +-endif() + + include(CMakePackageConfigHelpers) + configure_package_config_file(debian/cmake/package-config.cmake.in filamentConfig.cmake diff --git a/debian/patches/series b/debian/patches/series index 2562e09..aa9e616 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,3 +17,4 @@ 0017-Fix-TBuiltInResource-struct.patch 0018-Fix-compatibility-with-spirv-cross-SDK-1.3.236.patch 0019-Fix-build-with-gcc-13.patch +0020-Do-not-overwrite-debianized-ImportExecutables.patch